Fixed bug instroduced in last commit