update (no more random crashes ?)