r69 "quick bugfix for r68"