Fixed a bug
Adjust for merge