Works for 4.0@beta too. thanks
foxrip → created an issue.
#4 works well for me. I added the patch, just in case someone want to use it.