fix 291
fix 349