Fix to Make Debug better in VS