Fixed #77 #76