fix #135
fix #134