Issue #44

Revised fix for issue #44