fixed #6

fixed #7