really, wtf this @jvoisin cid fix should be reverted. this is wrong