fixed #1343
1.8 code merge needed here and revert x2 limit change