Fixes #414
It looks like this was a timing issue.