Deal with interlining correctly, fixes issue #1554