fix for issue #96