Fix #141 #144 #145