Trouble after upgrading to 2.1 agent