Fix major crash from v1.4.18
