fixed #15
fixed #16