Bug #1957. Take two