(Code Cleanup) Fixed Controller bug introduced in previous commit