fixed bug from i31