Fix class already loaded issue