Fix a class not found problem on startup since this class was not committed