Tmp fix for 'Cannot redeclare class etc.'