Small fix and attribution to gentilkiwi