Changed -w behavior