Fixed double-loading issue