fix those up