new fix for #237