Fix candidate for #2265