make it work with 0.6.5