Added hack to avoid double counting certain atoms. Slows down with MPI
though.