Fixing double agent bug