fix double loading properly