Fixed compatibility problem with last BP 2.5.0-SNAPSHOT