Fix a bug where BO was crashing from time to time