fresh fix for bug 53