Fix the bug uncovered by 7923268