simplify fix for #4