Feature/fix cancel terms