Better handling of term