Have a better fix for the previous issue.