bug fix atempt