bug fix -- some experimental changes crept into the repository accidentally