Fixing Issue 565