Fix problem with doubling accounts