actually fix the problem and not use a kludge