Make more reobust