Fixed #1318
Fixed #1320