Fixed compatibility with master