Tweaked file handler