fix #198
fix failed tests