Minor fix so production matches dev
Merge branch 'dev'
quick fix so prod matches dev