Fixed setup bug