Fix #6 #25 #20