fixed #79
fixed #63