Merge pull request #6646 from annando/fix-loxk