Bugfix v 1.1

Bugfix for produciton