Fix will setup