BUG:  Fixing logic.