Fix issue 1 in #3273.