Final fix that actually works