Fix issue with android orientation