Fixed issue #37.