Better fix to the last security issue.