#452 - dpmurray