Tried to fix map issues