Fixed issue #353