Improve robusness