Fix waek skip ID generation