Fixed buggy loading