fix: avoid variable overwritting
fix: avoid recreating same object twice