Keith Vogel's change for issue #374 applied.