Fixed bug introduced in last commit