Removed map refresh bug