I may have introduced a nasty bug that I just fixed