Fix of for issue #1345