Merge pull request #4440 from 5moufl/behindkink-fix