Fix #91

fix for issue #91 - please review