Fix issue with skip route