fresh fix for bug 303