fix for logic of last commit --- what was I thinking??