Bug fix 1989