Fix issue with certain themes