Fixed initial bug with lack of UUID