fix 347
fix 345