Fixed compatibility with Grido