Fix for bug 28