Fixing a bug in that last commit