Further 5.10 compatibility