This looks like the right thing--shouldn't the PCD classes above have this?