Fixed issue #755