Fixed bug introduced by last commit