Fixed issue #599.