To close Issue539