fixed the skip for 2.x - fixes #597