Removed duplicate code from FileHandle
Merge pull request #995 from hneuer/fh2

Removed duplicate code from FileHandle