Bugfix on gear override