Fixed EC problem, assertion problem etc.