Fixed a regretion bug due to merging