Rough fix for #129