fix from 5.34.03