Bug fix: now the previous commit is true (without breaking anything else).