修复#28，#29