Fixed underscores rendering