Fixed #2 : Scalability (again)

Using transactions seems to do the job