Fixed errors with skip