improve fix example + address discussion