Fixes Issue #482