Added fix for activity recreated scenario