Fix davix 2.6