Fixing Issue_534