Try the same fix as for the comments mode