BPC-266: first stable(working) fix