Citadel 2.6 compatibility