[faad2/f38] (3 commits) ...fix