fix bug from leon