Fix maps not being in correct places