Not related to this change, but I guess adding trailing "/" would be nice