Fixed oneshot disabling ordering issue