[css mode] Better fix for #1533