Trying to fix map