More betterer fix