Fixed incompatibility for OPC and Pickup modules