fixed #37
fixed #39