Fix #74 #76 #77