fix assign and resolve methods