Fixed issue #35.