Fixed a class load issue