First step in starting to fix this issue
Step two