Fixing Issue_142