Fix crash related to 38c4796