Correct bug where GF and PF would not rollback