fix #131
fix #127