Fix for -w flag