Fixed #1143