Improve robussness