updated for maps fix