bugfix setup