Replace skips where needed