Better fix for Kali