Putting a stricter guard on the check for completing tasks to see if we can see what's causing a couple of bugs