Added recursive check