changes needed for MapStory/mapstory/issues/770