Fixing Issue 193