Support 0.6.5 properly