Merge "fix the class not found crash"