[WARWAR] - fix with the new API
Merge pull request #1 from michalbe/master-temp

[WARWAR] - fix with the new API