Fixed a regression issue reported