Inevitable find of the actual bug, and hopefulyl final fix