Address bg issue on production