More atempting to fixes