Fixing Issue_384