Adapted to new rendering (no more HTML linebreaks)