Fix for #303

Pending PII patch #321