Fix for class reference