BasicData fixing