Fix Pin Skipping