Attempt at a fix for map scrolling problem