Bugfix/cabinet rollback