At some point we can replace this one with the new dispersy property