This fixes a bug in my last commit