resolve #4 #5