The issue seems to be not present before 16.4