Bug #495