Fixed a bug in the last commit