Fixade controller
Fix merge