Fix #2 - set map on load