Fixed a bug in previous commit