Fix CITIZENS-402