[0.0-51a] attempt to fix a crash