Fixes Issue #335