Fixed a bug introduced by previous commit