utils: Making fix broken more robust