better fix?