[#958] changed loading