Fixing Issue #311