Saving progress on fixing this issue.