Bugfix/setup