Fixing the double loading