fix bug from @kinchu