Another fix for issue #83