Change unreliable todo into skip to reduce noise