UGLY HACK to make tests pass...