Few changes to avoid recursion issues