Fix for #260