Working on double loading issue