Fixed #1247
Merge pull request #1248 from myuhe/ddskk

Fixed #1247