Fix oneshot command mode