what I think is a fix