Fixed roll back issues