fixed #9 #6