Tom Udall, fixes #499