fix changes as mention in the comment