Fixed issue #22.