Fix from CR #77