tweak for PR 168