hopefully this fix #360