fixed recursion problem (see ECLIPSE-921