Proper futureproof fix