removed recursion problem