fix BC for #3545 and also assert the same does work for disabled