Finally fixed BaseDIR Issue