fixed #52
fixed #71