Fixing Issue 51