Some more workaround

Please solve this headache