Replaced pointer error fix that was reversed with the previous commit.