Fixed issue #54.