Added proper skip