#38 My bad, was working on a hunch there.  This is in fact still needed to prevent the bug, in addiion to Craig's fix.