fix #4033 (part 4)