Fixes Issue #79