fixing more crap the merge messed up damn you CDE