Now it actually works properly