Fixed saving state when orientation of screen changing