Fixed bug introduced by last fix