fixed bug in setup. WIP