Fixed issue with entering view for first time