Fixed #3 #6