Fixing mode commands