fix IO-297 in our inner version and rotate bug