tweak for Bug #1484 fix