Revert clamp to zero and use another attempt fix