Fix CITIZENS-403