1116 Fixed #142