Fixing so it actually works