A fix for #279