Handle skip in setup section correctly