Fixed bug involving initilalization