Bug #507