fix regression with serene theme, #599