fix for issue #65
fix for issue #66