production workaround from stackoverflow