Fix didn't actually work - now it does