Merge pull request #2030 from nabinhait/hotfix

Hotfix
Fix account's master type