Now works with controllers that don't end in 's'