To close Issue556