Changes related to max recursive depth error - FIXED