Fixing Issue #203