fixed ON/OF shifting