finally fixed, I think