[faad2/f39] (2 commits) ...fix