Hopefully I am getting closer to a fix for production.