Possible fix for CITIZENS-451