Reduce scope of skip