Ugly refresh hack is not necessary anymmore?