Tried the patch in #2, not working for current version (2.0), will re-roll it...