lifetime bug fixed