Patchset for the second bug (3/5)