Fix for issue #92
Fix for issue #94