Fixed reference keeping across orientation changes (hopefully)