Close Bug #418