Fix skipping underscores