Fixed bug introduced with last commit