fix #191, #189