Patchset for the second bug (5/5)