Fixed issue #809.