Fixed initialization bug