Use newer form #428
Merge pull request #999 from sodaplayer/patch-3

Use newer form #428