Minor fix for production mode