perhaps a better fix