Fixed reset on orientaiton change