Fix moving controllers