3.3.x issue594