Bug fix for my last commit