Made library less sensitive to unintended collapse.