First pass at fixing #439
Merge branch 'issue/439'