Fixed issue #737