Fixed creator sometimes being nil