Prevented crash I caused at the same time as Linus solved another