Fix CITIZENS-454