Fixed setup again...