Issue 28: fix the rollback command