Fixed #4 #5