Bug fix, setup not working correctly