Fixes fix for issue #77