Starting the fix of #52... These bots be crazy.