A temporary work-around for Android rotation failure