Instantiation bug fix.