another lifecycle issue fixed

Change-Id: Id8acd1bda30156da8cf5f61537f76f778e1b9c74