Fixed welch segfaults