fix: Making more bulletproof