Catchup to Chung's file parsing fix