@shadyvb It looks like #497 is still a WIP. Could we make sure that the fix is in this PR so that we can get this bug fix out in the next release?