Fixed issue in initialization