Fixed a bug introduced in last commit