Additional change for issue #21.