Adjusted for a bug in ACPC types.