fixed #2 #3