Fixed issue #897