fixing a bug found on the release branch