Fixed bug where loader flickers