fix some recursion due to running twice