Fix #414
fix #411
Fix #412
Fix #413