Fixed the self closing tags issue