BasicData fixing 3