add handling of whitespaces