Bugfixing with setup