Close Bug #546

Close Bug #546