Fixing double loading