Fixing for latest version of Lime "next"