Change for issue #55.