Fix for GUI style leakage