attempt #132
fix #127