Shouldn't this also consider `-controller`?