Fixed C-w behavior