Possible fix for #289 [gh#289]