Make more robust