added guard for bug #860