working on fix for BUG #294. Not done yet, but this at least clears