[DEBUG] some string parsing correction