Fix #26 #27