better(?) fix for #150