New 3.3.3 fix