Fixed compatibility w/ BoP