[BEP-1027] Fixed compatibility with older versions