hopefully fix #380