fixed #28
fixed #28