hopefully fix crashes