Fixed intialization issue