fix for AccountManagerImpl