Fixed URI IllegalArgumentException (I think)