Fix ClassNotFound exception