fixed #63
fixed #59