Work for issue #4.