yet another fix, hopefully last for this set