resolved small lifecycle issue