Fixed #5 #6