fixed portal & mayor / wagon bug