Prod build fix