CB-3357: Fixing resource grabbing