possible fix for #232