Use "when" on includes and not in every task