fix double loading (again)