bug6

By dc_admin,