Attempt to fix issue in production