Fixed a bug introduced with the prev commit