Fixed issue #444