Fixed switching while pushing