Fix race condition, don’t rely on detect feature

detect feature is to be tested though