Fixing Issue_504