Fixed compatibility with ce-access