Fix for bug 264