Fix for While controller