Close Bugs

Close Bug #417