Fix #27 #20