fix crash regression