Fix #27 #26