Finished fixing mode switching