I think this is finally fixed