Fixing rollback - Server