Okay, better fix for soundness issue.