Yup, this is pretty close – I explained the bug here:
Unfortunately, it’s not a simple fix Hopefully we have some news to report soon, guys.