Changed to not require a trailing /