Avoid lonely underscores at the corners