First step in starting to fix this issue