More appropriate fix for #170