Fixed bug introducted in last commit