Fixed compatibility with PW 2.5.x