remove defer, need right solution.