Fixed to support both modal and normal presentation modes

Fixed to support both modal and normal presentation modes. Simple change.