Fix for bug 288