bug fix with distinct/accounts