Fix taken_by