Fixed a regression issue