Fix for issue #78