Fix issue #2042 -- part 1