Yes, you're right (not about the sense of humour part, I still find it horrible), so I edited the relevant phrase.