Fixed linking to droids