Commit 2 - Unfixed modeClose