Fixing mode changes