Even better fix