Fix Main issue