more fixed for 3.3 branch