Trying to fix load problem in production