- Fix for issue #74