BasicData fixing 2