Instantiation bug fix