CRITICAL FIX: stop nulling PMF