Bugfixin in setup