fix GM#1.9 and finish GM#1.10