Futureproof fix