fixed #132
fixed #127