Fix for citizen edge case