FIX:Bugs in setup