Fix: Remember controllers