Make moat work for witch (but I didn't test! lol)