Fixing Issue #211 Issue #212 Issue #214