Fixed compatibility with latest Monkey version