fixed #3 #4