bugfix for production version