fixing lifecycle