additional fix for #338