catch both cases that fail for #610