fixed some rollbacks