Fixed #5 by removing the rollback :always feature