Add the secondary behaviour for #2759