Hack to work with Yerdle