Fix for issue #83