Improve on issue #25, by not having images where OS cleans up