if this is refactoring, why do this which looks like a bugfix?