Fixed classes not loading correctly