Fixing Issue 527