Fixed to work without citadel enabled