Revert clamp to zero and use another attempt fix 

Revert clamp to zero and use another attempt fix from @