Fixed reset on orientation change