fixed #48
fixed #47
fixed #46