Fix for name loading problem