added handling for overridden mount points