Bug fix: removed reference to accounts