painful...but mostly fixed