Fixed double and single underscores