Update for issue #17.