Fix support for non local files