Another fix for the fix (Now it's fine)