Fixed a refactoring error in ba5138b1.

Thanks Florian for tracing the error.