Is this related to the capability query or is it a separate bug?