fix based on first deploy