Fixed bug in last commit