Security fix to my last commit.