Merge pull request #3785 from techee/anon_fix