simplify fix for #442