Rollback support JP