Buffer rollback seems to have fixed problem