Fix crashing bug introduced in 0.20