Fixed #48: Context Variable values lost after orientation change