Bug fix on skip.