sync with prod fix