fix for 266 -> ??? bug, but probably a hack