Fixed issue #911