More reliable fix in the face of crashes with previous approach.