Slightly better behavior when running over file: protocol (issue #9)