Fix for 0H/s issue on different algorithms