Fixes some issues when going into first person and back.
Merge pull request #348 from headswe/dev

Fixes some issues when going into first person and back.