Fixed bug introduced with previous commit