Includes fix in case of re-instantiation