Some fix for 2nd pass