fixed #25
fixed #15