Attempt to support MCPC+