[XNIO-194] Detection still not quite right