fixed #35
fixed #34