Fixing Issue #229