Close Bug #94