fixed file loading order