Fixed more infinite chip/block issues

#421