Change logic of handling whitespaces and others.