Fix for 5.18 and 5.20