Fixed issue #21.