Possible fix for CITIZENS-443