fixed transition on fad controllers
Merge remote-tracking branch 'origin/master'