simplified fix for #177