fixed #108
fixed #109