Fixed #13 #9