Fix to prevent front controller from appearing in right position after swap.
Merge branch 'master' of github.com:lolay/kat