Fixed unreliable code