Ugly hack to avoid page loading issue