bugfix for production