fixed #1

fixed #8