issue since 3.5.13 upgrade