Fix to work on 5.16