Switch to self closing to fix errors