Fixed defaultRollback behaviour