The previous version doesn't seem to have fully fixed issue #1507. 