FIX Temporary fix for class conflict