Some changes, same assert error