Added fix for URI with systems paths containing dots.