Really fix for new theme engine.