Fix for Issue #70.
Additional work on PDMC