This was also fixed in 8.1.22, so if you take that version you don't need to apply any extra styling.