another fix, but leaves us with another issue