start of a fix, not complete