Fixed bugs in getAccount()