Fix ClassNotFound Bug