weird container issue in Prod, need to fix it