Fix for issue #73