Fixed compatibility with Aurora.