fixed #11
fixed #6