Fixing Issue 37