Continue Bug fix: last fix remains problem.