pull in changes from upstream pr #3