Possible fix for #102