fix #4456 (refactoring mistake in 9992162)