Make compatible with newest Citizens.