fixed #45
fixed #51