possible fix for #166