Temp fix for static UI