Finally fix skipping when wall hugging