Patchset for the second bug (2/5)