Ack real fix
cleanup of if tib full logic