Quick fix for class name clash