Avoid unintended choice-point