Another fix for #131