Possible fix for #175