Fixed Class loading issue