BasicData fixing 1