Changes made due to the Bug(artf868634).