fixed #35
fixed #36