server loader fix & import state fix