these fixes fix nothing

FIX THIS !