Possible fix for #124