fixed #46
fixed #48
fixed #49