Make limits more robust