isn't the second "dead" check in the (new) line 265 useless then?