Fix nested commands

Finally status updates are being interrupted and handled properly.