Fix for pushing of Mode change