fixed#2, fixed#3, f:8,31