Fix for issue #79