Improve skip spaces behavior