fix regression wrt crashing