Updated, for bug 234
